projects
/
project
/
bcm63xx
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cdf33c9
)
imx: mx6ul: using runtime check when configuring PMIC_STBY_REQ
author
Peng Fan
<
[email protected]
>
Thu, 11 Aug 2016 06:02:44 +0000
(14:02 +0800)
committer
Stefano Babic
<
[email protected]
>
Tue, 4 Oct 2016 13:41:00 +0000
(15:41 +0200)
Since MX6ULL select MX6UL, we can not use IS_ENABLED(CONFIG_MX6UL) here,
because this piece code is only for i.MX6UL.
Signed-off-by: Peng Fan <
[email protected]
>
Cc: Stefano Babic <
[email protected]
>
Reviewed-by: Stefano Babic <
[email protected]
>
arch/arm/cpu/armv7/mx6/soc.c
patch
|
blob
|
history
diff --git
a/arch/arm/cpu/armv7/mx6/soc.c
b/arch/arm/cpu/armv7/mx6/soc.c
index fef4eb72ee273d5c3a58954c004f272c6699d9c2..109a15983a910ffbb9a90ca755f18dcc5243fcbb 100644
(file)
--- a/
arch/arm/cpu/armv7/mx6/soc.c
+++ b/
arch/arm/cpu/armv7/mx6/soc.c
@@
-356,7
+356,7
@@
int arch_cpu_init(void)
set_ahb_rate(132000000);
}
- if (
IS_ENABLED(CONFIG_MX6UL
) && is_soc_rev(CHIP_REV_1_0) == 0) {
+ if (
is_mx6ul(
) && is_soc_rev(CHIP_REV_1_0) == 0) {
/*
* According to the design team's requirement on i.MX6UL,
* the PMIC_STBY_REQ PAD should be configured as open